Merge with xen-unstable.hg.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

diff --cc tools/libxc/Makefile
Simple merge

diff --cc tools/libxc/xc_dom_x86.c
Simple merge

diff --cc tools/python/xen/lowlevel/xc/xc.c
Simple merge

diff --cc tools/python/xen/xend/image.py
Simple merge

diff --cc xen/arch/powerpc/setup.c
Simple merge